Interface extended.
Merge commit '06a67a3816c39dd392c28814d84477e7cb05006f' into 0.4