WPBQA-393: initial solution.
WPBQA-393: change placement.