Re-arranged scheme
Merge commit '2b60a599b37e0f0ef7b27bfa8d8a7fc128881000' into develop